From: Andrew Warfield <andy@xensource.com>
Date: Fri, 1 Sep 2006 20:24:51 +0000 (-0700)
Subject: Tapdisk cleanup.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15668^2~23
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=f1da4c1bac93efb640078be3d5e01bc634b3214f;p=xen.git

Tapdisk cleanup.

Sign-off-by: Jun Koi <junkoi2004@gmail.com>
---

diff --git a/tools/blktap/drivers/tapdisk.c b/tools/blktap/drivers/tapdisk.c
index 0b319ac0ec..3190a2b219 100644
--- a/tools/blktap/drivers/tapdisk.c
+++ b/tools/blktap/drivers/tapdisk.c
@@ -127,18 +127,15 @@ void sig_handler(int sig)
 static inline int LOCAL_FD_SET(fd_set *readfds)
 {
 	fd_list_entry_t *ptr;
-	int i;
 
 	ptr = fd_start;
 	while (ptr != NULL) {
 		if (ptr->tap_fd) {
 			FD_SET(ptr->tap_fd, readfds);
-			for (i = 0; i < MAX_IOFD; i++) {
-				if (ptr->io_fd[i]) 
-					FD_SET(ptr->io_fd[i], readfds);
-				maxfds = (ptr->io_fd[i] > maxfds ? 
-					  ptr->io_fd[i]: maxfds);
-			}
+			if (ptr->io_fd[READ]) 
+				FD_SET(ptr->io_fd[READ], readfds);
+			maxfds = (ptr->io_fd[READ] > maxfds ? 
+					ptr->io_fd[READ]: maxfds);
 			maxfds = (ptr->tap_fd > maxfds ? ptr->tap_fd: maxfds);
 		}
 		ptr = ptr->next;
@@ -580,7 +577,7 @@ static void get_io_request(struct td_state *s)
 
 int main(int argc, char *argv[])
 {
-	int len, msglen, ret, i;
+	int len, msglen, ret;
 	char *p, *buf;
 	fd_set readfds, writefds;
 	struct timeval timeout;
@@ -633,16 +630,14 @@ int main(int argc, char *argv[])
 			     (fd_set *) 0, &timeout);
 
 		if (ret > 0) 
-                {
+		{
 			ptr = fd_start;
 			while (ptr != NULL) {
 				if (FD_ISSET(ptr->tap_fd, &readfds)) 
 					get_io_request(ptr->s);
-				for (i = 0; i < MAX_IOFD; i++) {
-					if (ptr->io_fd[i] && 
-					   FD_ISSET(ptr->io_fd[i], &readfds)) 
-						io_done(ptr->s, i);
-				}
+				if (ptr->io_fd[READ] && 
+						FD_ISSET(ptr->io_fd[READ], &readfds)) 
+					io_done(ptr->s, READ);
 
 				ptr = ptr->next;
 			}